Tag: merge

git push not updating remote git repository

I’m working on some file in my local git repository and want to send the changes to the an existing remote git repository from which the local was cloned via https. I know you’re not suppose to update a not bare-repository, so I created a branch to push the changes. Here is what I’ve done, […]

Patch deployment – git doesn't fetch the latest remote commit

I need to apply a patch but: The patch (.sh script to run) breaks the website (a little). I fixed the pages broke by the patch and committed the modifications in git. The patch modify both the file system and database. The patch cannot be applied if it detects that some of its content is […]

override merge two branches in Git

Is there any way to merge branch A into B and Override anything in B with what with A no matter if there are conflicts or not?

Explanation of 1 commit ahead of master and 1 commit behind master

I just updated my branch on GitHub with a push. I wanted to add some files that were taken out before. After the merge, my work should match the work on the master branch and everything on both branches should be up to date, but it still says “1 commit behind master”. I also saw […]

Is git not able to tell which commits were only made to that branch?

So if two developers create their own branches (A and B) from the dev branch, make their commits, then A and B are merged in (consecutively) to dev, then B is checked-out again, fast-forwarded, and new commits made, and management says they now need B to go live (to master) but not A, a merge […]

Git & automatically merging branches with master branch

I’m working on becoming more acquainted with git. I’m the sole person working on a project here at work, so I’ve gotten by with just making changes to the master branch all of the time but I need to step it up and be more fluent in working with branches. So yesterday I created a […]

Git merge branches

I would like to merge a couple of branches in my project but I don’t know how to get Git to merge. I am doing my work on Linux Fedora 22. I had the following Git structure on my project, where CAPITAL letters are branches and small letters are commits: ATTINY / >- MASTER – […]

Does Git support automatic merge conflict resolution for append-only files?

In our project, we store localized strings in an XML file that is loaded by the application. These files are managed by a localization management tool, we don’t edit the files directly. Now whenever two developers add new localized strings on different branches, they produce merge conflicts. In the majority of the cases, localization strings […]

Merging strategy with a long development branch. How to prevent heavy conflicts in the future merge?

I’m developing a project where I constantly want to make small improvements on master branch and push them to production. I have problem because I want to concurrently work on a branch that will be pushed only after a long time. If I will use different branches on long_project and not merge them immediately, one […]

After merging, but before committing, how can I force a manual re-merge on a specific file?

During a merge a certain file was auto merged successfully. I now have the results staged but not committed. However I am unhappy with the result in a specific file and want to initiate a 3 way merge manually on said file. Effectively, I want to get the same result as if I’d had a […]

Git Baby is a git and github fan, let's start git clone.