-3

I have just ran git merge master on my local branch, resolved the conflicts that it was presenting.

However, git will now no longer allow me to commit to my branch using git push. I have just ran git pull and have been met with this feedback: 

    There is no tracking information for the current branch.
    Please specify which branch you want to merge with.
    See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=<remote>/<branch> 4318-niall-activities

I don't want to over right my current work but I want to submit a Pull request with all my current work. Can anyone offer some advice?

user2026178
  • 308
  • 2
  • 4
  • 21

1 Answers1

0

As the error message is pointing out, your local branches are not linked to a remote repository. You can do git push origin [remotebranch] or use git branch --set-upstream-to=<remote>/<branch> 4318-niall-activities to be able to push or pull again, replacing remote and branch with your use case. Remote being origin usually

Jean Rostan
  • 1,056
  • 1
  • 8
  • 16
  • `git push origin 4318-niall-activities` gave back: `error: failed to push some refs to 'https://github.com/comediadesign/nec-phase-1.git' 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 ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. ` – user2026178 Apr 06 '18 at 18:32
  • 1
    then do `git pull origin 4318-niall-activities` , it will merge remote changes into your local work. Won't erase your work – Jean Rostan Apr 06 '18 at 18:35