1
poweron@innpro:/home/poweron/addons/nextcloud$ git pull origin main
2
remote: Enumerating objects: 55, done.
3
remote: Counting objects: 100% (23/23), done.
4
remote: Compressing objects: 100% (2/2), done.
5
remote: Total 55 (delta 21), reused 21 (delta 21), pack-reused 32 (from 1)
6
Unpacking objects: 100% (55/55), 15.57 KiB | 215.00 KiB/s, done.
7
From github.com:/euroblaze/nextcloud
8
 * branch            main       -> FETCH_HEAD
9
   b704905..eb04036  main       -> origin/main
10
Updating b704905..eb04036
11
error: Your local changes to the following files would be overwritten by merge:
12
	__manifest__.py
13
Please commit your changes or stash them before you merge.
14
Aborting
15
poweron@innpro:/home/poweron/addons/nextcloud$ git add . && git commit -m"updated manifest file" && git push origin main
16
[main 385a863] updated manifest file
17
 Committer: PowerOn <[email protected]>
18
Your name and email address were configured automatically based
19
on your username and hostname. Please check that they are accurate.
20
You can suppress this message by setting them explicitly. Run the
21
following command and follow the instructions in your editor to edit
22
your configuration file:
23
 
24
    git config --global --edit
25
 
26
After doing this, you may fix the identity used for this commit with:
27
 
28
    git commit --amend --reset-author
29
 
30
 1 file changed, 5 insertions(+), 5 deletions(-)
31
To github.com:/euroblaze/nextcloud
32
 ! [rejected]        main -> main (non-fast-forward)
33
error: failed to push some refs to 'github.com:/euroblaze/nextcloud'
34
hint: Updates were rejected because the tip of your current branch is behind
35
hint: its remote counterpart. Integrate the remote changes (e.g.
36
hint: 'git pull ...') before pushing again.
37
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
38
poweron@innpro:/home/poweron/addons/nextcloud$ git stash
39
No local changes to save
40
poweron@innpro:/home/poweron/addons/nextcloud$ git pull origin main
41
From github.com:/euroblaze/nextcloud
42
 * branch            main       -> FETCH_HEAD
43
hint: You have divergent branches and need to specify how to reconcile them.
44
hint: You can do so by running one of the following commands sometime before
45
hint: your next pull:
46
hint: 
47
hint:   git config pull.rebase false  # merge
48
hint:   git config pull.rebase true   # rebase
49
hint:   git config pull.ff only       # fast-forward only
50
hint: 
51
hint: You can replace "git config" with "git config --global" to set a default
52
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
53
hint: or --ff-only on the command line to override the configured default per
54
hint: invocation.
55
fatal: Need to specify how to reconcile divergent branches.
56
poweron@innpro:/home/poweron/addons/nextcloud$