CoreBOSBB › Support › Administrator Support v
Git Pull Error - commit your changes or stash them before you can merge

Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
Thread Modes
Git Pull Error - commit your changes or stash them before you can merge
mweaver Offline
Administrator
*******
Posts: 169
Threads: 41
Joined: Apr 2015
Reputation: 24
#1
07-01-2018, 11:19 PM (This post was last modified: 07-01-2018, 11:20 PM by mweaver.)
I'm getting a strange error when I attempt to perform a git pull to get the latest changes to CoreBOS.


Code:
]# git pull

Updating 1afe78b..efc210f
error: Your local changes to the following files would be overwritten by merge:
        log4php.properties
Please, commit your changes or stash them before you can merge.
Aborting



What it is trying to tell me?
Mark

[i]If I could work while on horseback that's where I'd be doing it. There's nothing like riding... Gives new meaning to the phrase, ride to live... live to ride.[/i]
Find
Reply


Messages In This Thread
Git Pull Error - commit your changes or stash them before you can merge - mweaver - 07-01-2018, 11:19 PM

Forum Jump:


Users browsing this thread: 4 Guest(s)