git-merge

Excuse me but this may be a noob question but it jsut crossed my thoughts and I think it is worth to fix my ideas and get a relevant explanation from some experts. I remember (I may be wrong) that when I submitted some pull requests to some repository, when the PR is merged to the master (or other branch), I'm notified about that action and when accessing the PR url I can see a sort of This PR has been merged into... message. Just browsing an old issue, I can no more see that kinf of message and what is only seen is that the issue is closed: No merge message and I had to go through the blame

Following Nvie's git branching model, why do I end up with 'develop' and 'master' each 1 ahead and 1 behind the other after merging the same 'release' branch into both? If the same 'release' branch is merged into each, shouldn't master and develop agree? x 84a628d (origin/develop, develop) Merge branch 'release-v3.0.1' into develop |\ | | x 2e4d60b (HEAD, v3.0.1, origin/master, master) Merge branch 'release-v3.0.1' | | |\ | | |/ | |/| | x | 716ce96 (release-v3.0.1) Version 3.0.1 |/ / x | fe3b54d Some more more code x | 3683892 Some more code x | 8c0b835 'develop' branch code |/ x d051b54 (v3.0

We've recently started using git-flow in our company, and we've came across the following issue: We have a DEV_MODE boolean that controls the level of logging in the app, we want the develop branch to always have DEV_MODE=true . However, when releasing a version we change the DEV_MODE to false . When I do finish-release in git-flow , it'll merge the DEV_MODE=false into the develop branch. I there a hook I can use to prevent this, or maybe a way to tell git how to merge files from release branches to develop? VonC You can avoid the merge issue entirely by versionning a file "template", with a

I performed multiple merge commits but they should have been merge --squash instead. The conflict resolution took more than a day so I can't afford to redo the merging by hand. Is there a way to convert the merge to merge --squash ? It's worth noting here that git merge and git merge --squash are closely related, but git merge --squash does not create a merge . The phrasing here is very important, particularly the article "a" in front of "merge": "a merge" is a noun, while "to merge" is a verb. Both commands perform the act of merging. The difference lies in how the result is saved . It's also

in a custom merge driver I need to get the full path of the conflicting file. Git provides only temporary files located at the root of the repository. Is there any way to ask Git what file it is trying to merge at the moment? Any git command that provides this information during the merge? UPDATE: I mailed to the Git mailing list. At the moment there is no option but my suggestion of an additional Parameter %P (path) may be implemented today. UPDATE 2015-06-05: My request has been added to git :) https://github.com/git/git/commit/ef45bb1f8156030446658d5bfb3983ce214a9e16 Greetings, Andreas The

I am using git to track a large LaTeX document which I write using Kile on different machines. Kile writes to its .kilepr config file when closing Kile. The problem I often run into is that I commit before closing Kile. So I commit and push, work on the other machine, and when I come back and want to pull I get a merge conflict because the .kilepr file contains the cursor position (which obviously changed now). My question: Is there a way to add a merge rule to git config for a specific file (always use --theirs )? Using .gitignore is not an option since the .kilepr file contains important