Skip to main content
3D Printing

Return to Answer

replaced http://stackoverflow.com/ with https://stackoverflow.com/
Source Link
Community Bot
Community Bot
  • 1

Based on thisthis answer, you need the following procedure:

  1. Stash your local changes using git stash
  2. Pull from remote repository using git pull
  3. Merge your stashed configuration file using git stash pop

Of course, if there are changes in the configuration.h file on the remote repository and cause conflicts, you will need to resolve them, but it should be straight forward.

Based on this answer, you need the following procedure:

  1. Stash your local changes using git stash
  2. Pull from remote repository using git pull
  3. Merge your stashed configuration file using git stash pop

Of course, if there are changes in the configuration.h file on the remote repository and cause conflicts, you will need to resolve them, but it should be straight forward.

Based on this answer, you need the following procedure:

  1. Stash your local changes using git stash
  2. Pull from remote repository using git pull
  3. Merge your stashed configuration file using git stash pop

Of course, if there are changes in the configuration.h file on the remote repository and cause conflicts, you will need to resolve them, but it should be straight forward.

Source Link
Demetris
Demetris
  • 233
  • 1
  • 6

Based on this answer, you need the following procedure:

  1. Stash your local changes using git stash
  2. Pull from remote repository using git pull
  3. Merge your stashed configuration file using git stash pop

Of course, if there are changes in the configuration.h file on the remote repository and cause conflicts, you will need to resolve them, but it should be straight forward.