SolvedPyBitmessage Please, commit your changes or stash them before you can merge. Aborting ?? help on updating!

After a few months of not updating Bitmessage, i do a git pull on Ubuntu in PyBitmessage
dir, and shows this error in terminal:
"Please, commit your changes or stash them before you can merge. Aborting"

Please help on forcing git pull for easy update after long time?

Also another question,
I ended up doing:

git clone https://github.com/Bitmessage/PyBitmessage "/home/$USER/PyBitmessage/"
rsync -h --progress --stats -r -t --modify-window=1 -l -D --update "/home/$USER/PyBitmessage/" "$BitmessageDir"

Would this be considered an alternative and safe way while keeping settings intact?

24 Answers

βœ”οΈAccepted Answer

git stash
git pull
git stash apply

Just use stash

Related Issues:

22
PyBitmessage Please, commit your changes or stash them before you can merge. Aborting ?? help on updating!
Just use stash After a few months of not updating Bitmessage i do a git pull on Ubuntu in PyBitmessa...
53
community edition MS Teams don't work
As a quick and dirty hack: edit the service open the β€œAdvanced” section Seeing error when trying to ...
43
MessageKit Delete message by long press on cell ?
Okay so @JulienLevallois here is a working example Hi ! I want to delete message by long press gestu...
23
JSQMessagesViewController Couldn't load async image with JSQPhotoMediaItem
This is my class if you wanted I try to load image from URL with this code but image view still not ...
17
franz Franz is blocked in full screen
As a quick fix Quit Franz Go to %APPDATA%\Franz Delete the window-state.json We are going to add ful...
16
ferdi Google Issues Megathread ("Browser or app may not be secure")
In the meantime As seen in #263 #229 and #140 ...
16
tdesktop fontconfig error when telegram when launch
As for now I've managed to have properly working Telegram with correct dialog windows and fonts in D...
13
JSQMessagesViewController [Custom Cells] Inputting buttons and labels
I've found the solution for subclassing JSQMessagesViewCollectionViewCellIncoming and JSQMessagesVie...
5
community edition Whatsapp Error (Needs Chrome 36+)
So here is a workaround using a custom service: Step 1 Create Custom service Step 2 Name: Whatever U...
4
franz Microsoft Teams Not loading
Workaround? From Franz menu choose View -> Service Developer Tools In dev tools go to Application ->...
4
tdesktop Irrelevant Ubuntu Mate tray icon appearance: as N/A icon
I found a great solution: dbus-launch ~/bin/TelegramDesktop/Telegram -- %u It works completely OK un...
3
JSQMessagesViewController collection view display error when I use JSQMessagesViewController as a navigationCotroller's rootViewController
There is a pull request to fix this but the fix is override func viewDidLayoutSubviews() { if let na...
3
status react 'RCTBridgeModule.h' file not found
I had this issue and solved it by doing: rm -r node_modules/ rm -r ios/Pods npm install cd ios && po...
85
go ethereum Unable to attach
Apparently on Windows we now have to specify the IPC path and it was not necessary in Geth 1.7.3: ge...
58
go ethereum Vendoring fails on projects using the native Golang bindings
A temporary solution is to just manually copy the files into vendor: System information Expected beh...
32
go ethereum eth.getBlock("latest").number is always 0
Syncing Ethereum is a pain point for many people so I'll try to detail what's happening behind the s...
27
js ipfs πŸš€ 0.23 Release 🌟
We are getting ready to launch the 0.23 release of js-ipfs ...
18
bitcoin test: Remove sync_blocks global
Thanks @brakmic and everyone else for working on issues and making improvements ...
18
go ethereum Synchronisation failed "retrieved hash chain is invalid"
Apparently there is data missing from your database This can happen if your PC was shut down abruptl...
17
bitcoin Windows build appears broken on WSL (buntu okay)
This error is caused by WSL now including Windows PATH In bash if you echo ${PATH} you'll see it's m...
16
bitcoin Compilation error for windows target
Solved the issue Bitcoin uses g++ not gcc $ sudo update-alternatives --config x86_64-w64-mingw32-g++...
16
go ethereum Unable to attach to the local running geth node
On MacOS for testnet: geth attach ipc:/Users/ekotysh/Library/Ethereum/testnet/geth.ipc ...
15
go ethereum why my chaindata size up to 400GB?
@MysticRyuujin We're working on a memory cache to reduce database writes quite significantly (PoC te...
12
bitcoin GUI: Who is the GUI being designed for and how do we better avoid bikeshedding?
My personal view and projections on the GUI: I think we should not give up the hope to make Bitcoin ...
12
bitcoin Release schedule for 0.21.0
v0.21.0 (final) was just tagged Here is a proposed release schedule for 0.21.0 the next major releas...
12
js ipfs daemon leaves behind api file lock on error
While using the js-ipfs in node encountering this error: During the development the app is being res...
11
bitcoin Release schedule for 0.18.0
0.18 has been branched πŸŽ‰. Here is a proposed release schedule for 0.18.0 the next major release of ...
11
bitcoin Bitcoind ThreadRPCServer authentication problems
I was running it on Ubuntu 16 I had rpcuser and rpcpassword in the config file but I was getting 401...
11
go ethereum Random ordering of equally-priced transactions incentivises competitive spam
If Geth does move away from randomized choice I would prefer FIFO instead of lowest tx hash ...
11
syncthing Upgrading syncthing-relaysrv to 1.15.0 fails in post-installation
I fixed this installation issue by adding echo after line 10 in /var/lib/dpkg/info/syncthing-relaysr...
9
go ethereum Error starting protocol stack: missing block number for head header hash
@karalabe Having same problem starting from yesterday System information Geth version: 1.6.0 OS & Ve...
8
gun TypeScript
Hello everyone I've published @types/gun. Hi what is your opinion about TypeScript TypeScript got a ...
5
simple peer Failed to set remote answer sdp: Called in wrong state: STATE_INPROGRESS
Btw you shouldn't add a new set of event listeners in socket.on('receivePeerSignal' ...
4
bitcoin Can't sync signet using 0.21-rc3
178.128.221.177 upgraded to latest aj/202009-signet-generate (69c6e47) I downloaded bitcoin-0.21.0rc...
4
qTox Choosing camera in settings causing qTox to crashing
Hey guys I was pointed to issues with your project in the MSDN forum thread linked above and I decid...
926
keras Loading model with custom loss function: ValueError: 'Unknown loss function'
I solved this problem by adding 'custom_bojects' my loss function: I trained and saved a model that ...
731
scrapy ' error: command 'x86_64-linux-gnu-gcc' failed with exit status 1 '
@euler16 for scrapy with Python 3 you'll need with Python 2 you'll need I wanted to install scrapy i...
633
keras Tensorflow backend - bug in model._make_predict_function(...)
I had this problem when doing inference in a different thread than where I loaded my model ...
575
mysqlclient Can't install mysqlclient on MacOS
You can set ssl library path explicitly. Hi I'm on MacOSX Sierra ...
516
keras Creating Model variable throws "AttributeError: 'Tensor' object has no attribute '_keras_history'"
@zaid478 oh I assumed you were doing it on coursera Anyway Hello all setup: Keras 2.0 Tensorflow 1.0...
456
tensorflow ImportError: libcublas.so.10.0: cannot open shared object file: No such file or directory
@rhinsall I just found this out myself not sure if it's common knowledge but got around this by doin...
423
ipython Last jedi release (0.18.0) is incompatible with ipython (7.19 and 7.18 tested); reason - column arg was deprecated, and now removed
As a temporary fix for anyone just trying to get things working again: It would be really nice if yo...
416
pyodbc pip install pyodbc failing: error: command 'x86_64-linux-gnu-gcc' failed with exit status 1
src/pyodbc.h:56:17: fatal error: sql.h: No such file or directory #include <sql.h> ^ Your machine do...
395
keras "<tensor> is not an element of this graph." when loading model.
I had a problem similar to that of @piraka9011 which was solved by calling model._make_predict_funct...
392
psycopg2 psycopg2-binary fails to install on macOS Big Sur 11.0.1 and Python 3.9.0 (with possible workaround)
Actually figured it out Haven't worked on a Mac in a while and forgot about the PostgreSQL dependenc...
387
pytorch I can't import PyTorch, libomp.dylib can't be loaded.
brew install libomp solves the problem. πŸ› Bug I tried to install PyTorch but I can't use it ...
380
pytorch RuntimeError: cuda runtime error (59) : device-side assert triggered when running transfer_learning_tutorial
@soumith Hi I find the error it is due to my labels contain value -1 which is unacceptable in criter...
373
Zappa bad magic number in 'application': b'\x03\xf3\r\n': ImportError
I was able to fix this too by doing find -name \*.pyc -delete Mine definitely wasn't caused by PY2 -...
356
tensorflow At Runtime : "Error while reading resource variable softmax/kernel from Container: localhost"
I had the same issue in tensorflow 1.13.1 which I have resolved by creating a reference to the sessi...