Git pull gives conflicts with octopus strategy
Lately when I run
git pull in my master branch it occasionally gives the following merge error:
Trying simple merge with 7ff9b5...
Trying simple merge with 6872cd...
Simple merge did not work, trying automatic merge.
ERROR: content conflict in file.txt
fatal: merge program failed
Automated merge did not work.
Should not be doing an Octopus.
Merge with strategy octopus failed.
However after this merge attempt there are files that aren't even in the master branch. I can fix this issue using
git reset and pulling again but I was wondering where this head or commits where coming from how can I find this? I tried looking in
gitk and checking the local GitLab servers but I couldn't find anything.
I was hoping someone could help, I have a PHP page which uses shell_exec to zip up a directory and run git pull to bring down recent repository changes. $op = shell_exec(cd /home/user/git/$repo/$dir
Another question said git pull is like a git fetch + git merge. But what is the difference between git pull VS git fetch + git rebase?
I have 2 branches (master and dev). Another worker has pushed a new branch called stage into the repository so that stage is now 1 commit ahead of master. I am trying to pull down stage so that I can
Generally whenever i want to push in the changes to remote Git i follow thee steps: git stash git pull git stash pop //Resolve conflicts if any git push However i have also seen my teammates doing th
I followed the tutorial http://wiki.eclipse.org/EGit/User_Guide#GitHub_Tutorial to setup EGit with GitHub. When I want to pull I had the same problem described here: The current branch is not configur
When I run git pull, I get this: edson$ GIT_TRACE=1 git pull -v trace: exec: 'git-pull' '-v' trace: run_command: 'git-pull' '-v' trace: built-in: git 'rev-parse' '--git-dir' trace: built-in: git 'rev-
I'm running a merge with a scenario where several common ancestors are available so Git runs git merge recursive strategy. As such, it runs a merge to create a new ancestor that will, in turn, be
I just finished resolving some conflicts due to a pull from the remote repository of my project. I know that once conflicts have been resolved you have, to my knowledge, 2 solutions : git rebase --co
Git merge conflicts are shown like this usually: <<<<<<< HEAD:file.txt Code changed by A ======= Code changed by B >>>>>>> 77976da35a11db4580b80ae27e8d65caf52
How to check whether the remote repo has changed and I need to pull? Now I use this simple script: git pull --dry-run | grep -q -v 'Already up-to-date.' && changed=1 but it is rather heavy. D
Setup I've written a small script to do automatic pull/commit/push for some personal data. This script works great on my laptop (version 220.127.116.11-1) but on my server, the git pull command is failing wi
I've set up a git repo via ssh on an Ubuntu box I'm using as a media center/backup server. the steps I took were: cd repos git init <repoName> cd <repoName> git config --bool core.bare tru
I'd like to use git submodule. The steps I need to take to push my changes to my project are add/commit/push from submodule directory add/commit/push from parent directory Steps I need to take to
What is the equivalent command for accomplishing the use case of a git pull command (update to the tip and do auto resolve conflicts) ? I'm looking for the scm command which accomplishes the functiona
I have a git branch that continually gets 'recreated' with an alternating letter case every time I perform a 'git pull'. Assuming the branch name is 'a' (or 'A' for all I know), one 'git pull' will pr
In git to pull and use the latest changes to my local repository I'm using git pull. In hg, I also use hg pull but it prints then run 'hg update' to get a working copy I do run hg update but I wonder
The following set of commands worked correctly $ mkdir carboncake $ cd carboncake $ git init $ git remote add origin firstname.lastname@example.org:repositories/carboncake.git $ git pull But when i tried pull
Using git pull used to pull from the remote repository as expected - now, it's asking me to use git pull origin master. I don't quite understand the instructions it's giving me, saying I can add somet
I am using git GUI. How can I implement the git bash command git pull --rebase? I am going to use this command before push.
I frequently do a git pull on a live server. If my website fails after a git pull, what is the command to go back to previous version of website which is stable? Thanks
I just made a new repository on github. Starting with a folder full of files, the steps I did were: git init git add -A git remote add origin ... #Now pull in the first commit that github made git pul
I have a git repository that has dev, test and staging branches that get pulled to a vhost on a server. I need to be able to git pull on the server using my user account but for the files that are pul
I'd like to keep Git repositories on four machines synchronized, and all of them are private repos. Is it possible to set up a single Git repository to pull from the other three machines at the same t
Does anyone know if its possible to deploy to a server in a VPN using Octopus Deploy? If the tentacle is on the server in the VPN is there a way Octopus Deploy to connect/disconnect to a VPN? Cheers U
I'm just wondering what are more reasons to use git pull --rebase instead of git pull except this weird merge commits that appear when you do just git pull? Thanks!
Our company is using git for source control and on my machine I can push and pull to the server without entering a password everytime, however one of my colleagues has to repeatedly enter a password w
Sometimes git encounters conflicts in a file. However, if I look at the conflict with TortoiseMerge, which I usually use to resolve them, it shows no conflicts. It does show changes but it doesn't sho
How would I go about creating a bash alias that pipes any conflicting files from a git merge or git rebase into TextMate's mate command?
Evaluate (shell-command-to-string git pull -q) in emacs *scratch* buffer hangs emacs. From htop in bash,I noticed that after the git pull process which is forked from emacs ended,there always leave
My situation looks like that: I have two repositories with more or less the same code (let say repo A and B). I would like to pull repo B from repo A. On repo A I execute following commands: git remot
I'm trying to run git pull origin master on my production server, however it is failing with the following. From ssh://bitbucket.org/ala_arab/admnet * branch master -> FETCH_HEAD Auto-merging db/
I have a repo in bitbucket, and i am using git. So my branches are master develop_one develop_two When i use git clone email@example.com:project/project.git, i am getting only the master branch code
I ve just changed PC, i installed git bash as always. And i got some wird problem. When i always was doing some git pull or git clone http:// link/repo.git everything worked fine. Atm i cant pull or c
What is the difference between running git submodule update --remote vs cd <submodule directoy> git pull Assuming that the submodule was previously set to track some branch: git submodule ad
This question already has an answer here: Pull is not possible because you have unmerged files, git stash doesn't work. Don't want to commit 4 answers I tried to git pull from a repo, then I
I have two branches in which the project is working at both tips. I merge Branch A into Branch B (git checkout BranchB; git merge BranchA), resolve conflicts, and test Branch B to find that it no long
What I am interested in doing is creating an alias that adds all files, commits with a message, does a pull, if there are any conflicts stop and show a list of conflicted files, otherwise push. I have
This question has been asked a few times but i haven't found my specific use case: I do have a nas which has gitosis and serves as a git master. I have a laptop and a desktop, on the laptop I do have
I messed some config files up and need to get so that my git repos will push pull by default to master on github. I get this message the below code as a hint on what to fix and i understand it except
I have created a new commit, but forgot to pull before that using git stashand than git pull. Now if I will do the git pull . I'll get one more commit as merge origin/branch to my branch (already some
We're currently using git and I tried to come up with a reasonable workflow for people to use, but there's currently one issue that I'm not sure how to resolve. If there is a conflict when we do the m
A---B---C topic / D---G master Say I have the above branch structure in git. If I do git checkout topic followed by git rebase master, from what I've experienced, I will have to resolve conflicts for
I've been using git for a few years, and every once in a while when doing a merge, git reports some bizarre conflicts. Here's an example of an .htaccess file, from when I merged in the new 7.24 releas
I have a colleague who claims that git pull is harmful, and gets upset whenever someone uses it. The git pull command seems to be the canonical way to update your local repository. Does using git pull
I feel I am approaching this all wrong. I work as part of team and we use git. Now, when I pull updates from my team there are obviously conflicts from time to time - git seems to insert loads of text
I have a system setup like this: http://joemaller.com/990/a-web-focused-git-workflow/ However no matter how I configure the shell environment (i.e. GIT_DIR and PWD) the git-pull command does NOT run w
Pushing some commits to the remote gives a rather weird message: $ GIT_TRACE=2 git push trace: built-in: git 'push' trace: run_command: 'ssh' 'gitserver' 'git-receive-pack '\''~/git/test'\''' trace: r
I am very new to coding, can someone help me on how I can successfully execute git pull with cron job. I did write a Shell script that has git pull as follows and when I run the shell script on the te
How I can do this in one command on MacOSX? git stash git pull origin master git stash pop I've tried with git stash && git pull origin mater && git stash apply and works fine.
I generally do the git pull command to fetch+merge with my local repositor from remote repo Does git pull fetches+merges all the branches from github repo or just do the operation specifically for th