awshosteddokuwiki
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| awshosteddokuwiki [2025/07/20 05:51] – [Create CloudFront Distribution] sjoerd | awshosteddokuwiki [2025/08/16 15:25] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| Line 403: | Line 403: | ||
| * You have divergent branches and need to specify how to reconcile them. | * You have divergent branches and need to specify how to reconcile them. | ||
| * Solution: {{{git config --global pull.rebase true}}} | * Solution: {{{git config --global pull.rebase true}}} | ||
| + | * Fatal: Not possible to fast-forward, | ||
| + | * Solution: {{{git pull --rebase}}} | ||
| Always when you want to work with git on the server, follow the following steps: | Always when you want to work with git on the server, follow the following steps: | ||
awshosteddokuwiki.1752990703.txt.gz · Last modified: by sjoerd