[Csnd-dev] [OT] Git problem
| Date | 2016-05-01 12:28 |
| From | jpff |
| Subject | [Csnd-dev] [OT] Git problem |
On one system whenever I pull csound it wants merge message, despite there
being no local changes. So what happens is
day 1: git pull merges changes from github but asks me for message for the
merge.
day 2 I do a git pull with no change locally (no even a make) and the same happens
..repeat
gitk shows a tree line
---o-------------o---------o
__/\____x___x___/\___x__x_/
How do I return to sanity? |
| Date | 2016-05-01 12:36 |
| From | Justin Smith |
| Subject | Re: [Csnd-dev] [OT] Git problem |
Here's how I would deal with a situation like that: # in case I have local stuff that isn't in master git checkout -b WIPlocal # replace my "master" with origin's version of "master" git fetch git branch -D master git checkout origin/master After that your local master and the origin master have identical state and history, and you can compare with the WIPlocal and cherry pick differences at your leisure. On Sun, May 1, 2016 at 4:29 AM jpff <jpff@codemist.co.uk> wrote: On one system whenever I pull csound it wants merge message, despite there |
| Date | 2016-05-01 12:42 |
| From | Justin Smith |
| Subject | Re: [Csnd-dev] [OT] Git problem |
oh, almost forgot the last step git checkout -b master On Sun, May 1, 2016 at 4:36 AM Justin Smith <noisesmith@gmail.com> wrote:
|