Help
cancel
Showing results for 
Search instead for 
Did you mean: 
Highlighted
Copilot Lvl 2
Message 1 of 3

What is 'refs/remotes/origin/palette' ?

Solved! Go to Solution.

Hello everyone,

I am using git and I recently create a branche "palette" on my project. Satisfy by my new developpement, I merged everything in my branche "master"

$ git branch                                                                                                                             
  master                                                                                                                                                                                                          
* palette
$ git checkout master
Basculement sur la branche 'master'
Votre branche et 'origin/master' ont divergé,
et ont 6 et 2 commits différents chacune respectivement.
  (utilisez "git pull" pour fusionner la branche distante dans la vôtre)
$ git merge palette

Everything went OK, the result in my branche "master" is correct and correspond to what I was expected.

Then I decided to close my branch "palette" which was no more usefull, but here is the result I get :

$ git branch -d palette
warning: branche 'palette' non supprimée car elle n'a pas été fusionnée dans                                                                                                                                      
         'refs/remotes/origin/palette', même si elle est fusionnée dans HEAD.                                                                                                                                     
error: La branche 'palette' n'est pas totalement fusionnée.                                                                                                                                                       
Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D palette'.

which I could translate by : the branch "palette" was not closed because it is not merged in 'refs/remotes/origin/palette', even if it is merged in HEAD. error: the branche "palette" is not completly merged.

 

What am I supposed to do to completly merge my branch ? what is 'refs/remotes/origin/palette' ?

 

Thanks for your help ...

2 Replies
Solution
Copilot Lvl 2
Message 2 of 3

Re: What is 'refs/remotes/origin/palette' ?

I suppress and commit everything and then I get back all the files and that way I finally succed.

Probably somehing better to do but I didn't found it ...

How do we close a subject ?

Community Manager
Message 3 of 3

Re: What is 'refs/remotes/origin/palette' ?

Hi @FredericVansteenkiste,

 

Thanks for being here and we appreciate you coming back to post what worked for you. We'd like to keep this open as it might help another user if that's ok?

 

Best,

Andrea

Thanks for being here, sharing, and keeping our community awesome!
Best,
AndreaG

Mark helpful posts with Accept as Solution to help other users locate important info. Don't forget to give Kudos for great content!