{"id":41,"date":"2016-07-11T16:27:00","date_gmt":"2016-07-11T16:27:00","guid":{"rendered":"\/colin\/morethanfour\/post\/Git-how-to-create-a-merge-conflict-all-on-your-own"},"modified":"2016-07-11T16:27:00","modified_gmt":"2016-07-11T16:27:00","slug":"git-how-to-create-a-merge-conflict-all-on-your-own","status":"publish","type":"post","link":"https:\/\/spacefold.com\/colin\/morethanfour\/2016\/07\/11\/git-how-to-create-a-merge-conflict-all-on-your-own\/","title":{"rendered":"Git: how to create a merge conflict all on your own"},"content":{"rendered":"

I had some doubts that I was seeing all the changes from all developers, so I did some testing.<\/p>\n

(I ran a git log<\/strong> command after each step to see what changes would show up.)<\/p>\n

Step 1<\/strong>: Add a new file, and commit locally:<\/p>\n

\n
Mon Jul 11 21:05:41 2016 - Colin Nicholls : (Testing) Added a file locally
A       misc_scripts\/Testing_git_log.txt
<\/pre>\n<\/div>\n
 <\/strong><\/p>\n
Step 2<\/strong>: Pull from remote to refresh locally<\/p>\n
Step 3<\/strong>: Push my local changes to the remote (origin).<\/p>\n
Step 4<\/strong>: Edit the file, and commit. I misunderstood the use of the [x] Amend Last commit<\/strong> checkbox…<\/p>\n
\n
Mon Jul 11 21:10:28 2016 - Colin Nicholls : (Testing) Editing a file locally
A       misc_scripts\/Testing_git_log.txt<\/pre>\n
<\/div>\n
Note that the time-stamp has changed, and the comment text, but it is the same “Add” operation.<\/p>\n
Step 5<\/strong>: Edit the file again, and commit. (This time, I did not use the [  ] Amend last commit<\/strong>, and I commented thusly:<\/p>\n
\n
Mon Jul 11 21:10:28 2016 - Colin Nicholls : (Testing) Editing a file locally
A       misc_scripts\/Testing_git_log.txt
 
Mon Jul 11 21:12:43 2016 - Colin Nicholls : (testing) [ ] Amend last commit (did not check)
M       misc_scripts\/Testing_git_log.txt<\/pre>\n
<\/div>\n
Step 6<\/strong>: Do a push to remote repository:<\/p>\n
\n
git.exe push --progress \"origin\"<\/span> master:master
 
To https:\/\/github.abacab.com\/zyxx\/zyxx-db.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https:\/\/github.abacab.com\/zyxx\/zyxx-db.git'<\/span>
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...'<\/span>) before pushing again.
hint: See the 'Note about fast-forwards'<\/span> in<\/span> 'git push --help'<\/span> for<\/span> details.
git did not exit cleanly (exit code 1) (1981 ms @ 7\/11\/2016 13:14:39)
<\/pre>\n
<\/div>\n
OK, I don’t understand why “the tip of my current branch is behind its remote counterpart”, but it is telling me I should do another pull before pushing, so:<\/p>\n
Step 7<\/strong>: Pull from the remote to update locally:<\/p>\n
\n
git.exe pull --progress --no-rebase -v \"origin\"<\/span>
 
From https:\/\/github.abacab.com\/zyxx\/zyxx-db
= [up to date] master -> origin\/master
= [up to date] cmp13_convert -> origin\/cmp13_convert
= [up to date] dev_2015_02_A -> origin\/dev_2015_02_A
= [up to date] dyson -> origin\/dyson
= [up to date] edison -> origin\/edison
= [up to date] fermi -> origin\/fermi
= [up to date] gauss -> origin\/gauss
= [up to date] grendel -> origin\/grendel
= [up to date] hubble -> origin\/hubble
= [up to date] prod_2015_04 -> origin\/prod_2015_04
Auto-merging misc_scripts\/Testing_git_log.txt
CONFLICT (add\/add): Merge conflict in<\/span> misc_scripts\/Testing_git_log.txt
Automatic merge failed; fix conflicts and then commit the result.
git did not exit cleanly (exit code 1) (2231 ms @ 7\/11\/2016 13:15:42)<\/pre>\n
<\/div>\n
Now I’m in conflict with myself!?<\/p>\n<\/p>\n
Step 8<\/strong>: At this point, I resolved the conflict by selecting “mine” over “theirs”, and did another local commit. This time I got a special “merge commit” dialog that didn’t show any specific changed files, but clearly wanted to do something.<\/p>\n
So what does the log say at this point?<\/p>\n
\n
Mon Jul 11 21:05:41 2016 - Colin Nicholls : (Testing) Added a file locally
A       misc_scripts\/Testing_git_log.txt
 
Mon Jul 11 21:10:28 2016 - Colin Nicholls : (Testing) Editing a file locally
A       misc_scripts\/Testing_git_log.txt
 
Mon Jul 11 21:12:43 2016 - Colin Nicholls : (testing) [ ] Amend last commit (did not check)
M       misc_scripts\/Testing_git_log.txt
 
Mon Jul 11 21:22:08 2016 - Colin Nicholls : Merge branch 'master'<\/span> of https:\/\/github.abacab.com\/zyxx\/zyxx-db<\/pre>\n
<\/div>\n
Interesting:<\/p>\n
    \n
  1. The first edit operation has now returned to the log. It looks as though we have two “Add” operations.<\/li>\n
  2. We get a generic “merge branch” message as the most recent log entry.<\/li>\n
  3. Also, the time-stamps aren’t “local” time, at least, not my local time (it’s 13:25 PDT currently)<\/li>\n<\/ol>\n
    Step 9<\/strong>: Pull; delete test file; commit; push<\/p>\n
    \n
    Mon Jul 11 21:05:41 2016 - Colin Nicholls : (Testing) Added a file locally
    A       misc_scripts\/Testing_git_log.txt
     
    Mon Jul 11 21:10:28 2016 - Colin Nicholls : (Testing) Editing a file locally
    A       misc_scripts\/Testing_git_log.txt
     
    Mon Jul 11 21:12:43 2016 - Colin Nicholls : (testing) [ ] Amend last commit (did not check)
    M       misc_scripts\/Testing_git_log.txt
     
    Mon Jul 11 21:22:08 2016 - Colin Nicholls : Merge branch 'master'<\/span> of https:\/\/github.abacab.com\/zyxx\/zyxx-db
    Mon Jul 11 21:35:21 2016 - Colin Nicholls : (testing) deleted file
    D       misc_scripts\/Testing_git_log.txt<\/pre>\n
    <\/div>\n
    This needs further testing, perhaps, but I’m going to return to billable work at this point.<\/p>\n","protected":false},"excerpt":{"rendered":"
    I had some doubts that I was seeing all the changes from all developers, so I did some testing. (I ran a git log command after each step to see what changes would show up.) Step 1: Add a new file, and commit locally: Mon Jul 11 21:05:41 2016 – Colin Nicholls : (Testing) Added […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[15],"tags":[],"class_list":["post-41","post","type-post","status-publish","format-standard","hentry","category-source-control","post-preview"],"_links":{"self":[{"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/posts\/41","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/comments?post=41"}],"version-history":[{"count":0,"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/posts\/41\/revisions"}],"wp:attachment":[{"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/media?parent=41"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/categories?post=41"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/spacefold.com\/colin\/morethanfour\/wp-json\/wp\/v2\/tags?post=41"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}