![]() ![]() ![]() To solve this I manually configured Visual Diff Tool and Merge Tool (with as benefit that you can disable that annoying splash screen on launch everytime).Īrguments -nosplash -merge -result="$MERGED" "$LOCAL" "$BASE" "$REMOTE" This appearantly does not configure your bash to know the command diffmerge so than you have to set the path to the diffmerge (or update your bin config). This happend to me when diffmerge was installed via the pkg install instead of the installer. Helper = !/Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/jre/bin/java -Ddebug=false =true -jar /usr/local/Cellar/git-credential-manager/2.0.4/libexec/git-credential-manager-2.0.4.jarĬmd = /usr/local/bin/diffmerge \"$LOCAL\" \"$REMOTE\"Ĭmd = /usr/local/bin/diffmerge -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"Ĭmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge -nosplash \"$LOCAL\" \"$REMOTE\"Ĭmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge/Contents/MacOS/DiffMerge -merge -result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" gitconfig looks like when sourcetree configures diff merge for me: Įxcludesfile = /Users//.gitignore_globalĮmail = /Users//.stCommitMsg For some reason everytime when I select 'Resolve Conflicts -> Open External Merge Tool' sourcetree opens its waiting view and directly closes it. I've installed Sourctree and diffmerge and set diffmerge as the default merge tool. I'll attempt to debug this further.Recently I had a fresh install of macOS. We also imported this repo and git history/data from Stash. We used this branching strategy on Stash before and never had this issue. I'm not quite sure how can I debug this further. Secondly I'd expect the the MR title to be set consistently for both MRs with the same source branch (and same commits in the branch). (Currently it displays changes that are already present in the destination/target branch). Under the diffs/changes view on the MR, we would only see the diff/changes. This makes the MR overview screen confusing because one can't easily see the two MRs are the same, just to a different target. MR title is set to from the commit in the branch. Only when this bug occurs does the title for the MR for the target nonprod be set to the branch name (with the underscores stripped and the title capitalised.) This differs from the target production(default) MR, that It doesn't show these extra invalid changes that have already been merged. There are no extra merge commits and the diffs areĪlways correct, ie just the things I changed/just the difference between the source and target branch. The MR to the target production(default) branch is always correct/perfect. These "extra" changes have already been merged into the target branch. The issue is that the diff view then shows changes/diffs for changes that aren't from the source branch. It shows commits that aren't from the branch I created. The diffs view (Changes) view for the nonprod MR is incorrect and differs from that of the production MR. So clone -> production -> (create new branch) branch_example1īranch_example1 -> nonprod (the problem happens here)īranch_example1 -> production (the problem never happens here) Make the change in the new branch and submit two MRs, one to nonprod and one to production. We create new branches off/from production branch. Production is marked as the default branch. ![]() The way our git process works is we have two long standing branches, nonprod and production. Haven't been able to reproduce it elsewhere yet. ![]() It occurs randomly (and often, but not always) in our two main projects/repos. Steps to reproduceįor now I can't reproduce the issue consistently. MR diff/changes view shows commits/changes that have already been merged into target branch. GitLab should show the changes that will be merged in to the target branch. See comment below for detailed description of the current behavior. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |