prevent merge conflicts | gitattributes eol=lf #200

6543 · 2019-12-18T03:06:18Z

6543 commented

2019-12-18 03:06:18 +00:00

add gitattributes

lunny approved these changes 2019-12-18 11:19:07 +00:00

Dismissed

zeripath approved these changes 2019-12-30 19:52:20 +00:00

Dismissed

zeripath commented

2019-12-30 20:07:52 +00:00

@6543 could you send a blank commit it seems I can't get this one to work properly

6543 commented

2019-12-30 20:08:56 +00:00

@zeripath I recreated it ... hard work ;)

6543 commented

2019-12-30 20:12:23 +00:00

@zeripath rebase && push -f didn't work message:

Objekte aufzählen: 4, Fertig.
Zähle Objekte: 100% (4/4), Fertig.
Delta-Kompression verwendet bis zu 4 Threads.
Komprimiere Objekte: 100% (2/2), Fertig.
Schreibe Objekte: 100% (3/3), 995 Bytes | 995.00 KiB/s, Fertig.
Gesamt 3 (Delta 1), Wiederverwendet 0 (Delta 0)
error: inflate: data stream error (unknown compression method)
error: unable to unpack b3e88c6ece6e846265e549897d86cc848e44d57b header
fatal: loose object b3e88c6ece6e846265e549897d86cc848e44d57b (stored in /data/git/repositories/6543/go-sdk.git/objects/b3/e88c6ece6e846265e549897d86cc848e44d57b) is corrupt
remote: error: inflate: data stream error (unknown compression method)
remote: error: unable to unpack b3e88c6ece6e846265e549897d86cc848e44d57b header
remote: fatal: loose object b3e88c6ece6e846265e549897d86cc848e44d57b (stored in /data/git/repositories/6543/go-sdk.git/objects/b3/e88c6ece6e846265e549897d86cc848e44d57b) is corrupt
To gitea.com:6543/go-sdk.git
 ! [remote rejected] gitattributes -> gitattributes (missing necessary objects)
error: Fehler beim Versenden einiger Referenzen nach 'git@gitea.com:6543/go-sdk.git'

@zeripath `rebase && push -f` didn't work message: ``` Objekte aufzählen: 4, Fertig. Zähle Objekte: 100% (4/4), Fertig. Delta-Kompression verwendet bis zu 4 Threads. Komprimiere Objekte: 100% (2/2), Fertig. Schreibe Objekte: 100% (3/3), 995 Bytes | 995.00 KiB/s, Fertig. Gesamt 3 (Delta 1), Wiederverwendet 0 (Delta 0) error: inflate: data stream error (unknown compression method) error: unable to unpack b3e88c6ece6e846265e549897d86cc848e44d57b header fatal: loose object b3e88c6ece6e846265e549897d86cc848e44d57b (stored in /data/git/repositories/6543/go-sdk.git/objects/b3/e88c6ece6e846265e549897d86cc848e44d57b) is corrupt remote: error: inflate: data stream error (unknown compression method) remote: error: unable to unpack b3e88c6ece6e846265e549897d86cc848e44d57b header remote: fatal: loose object b3e88c6ece6e846265e549897d86cc848e44d57b (stored in /data/git/repositories/6543/go-sdk.git/objects/b3/e88c6ece6e846265e549897d86cc848e44d57b) is corrupt To gitea.com:6543/go-sdk.git ! [remote rejected] gitattributes -> gitattributes (missing necessary objects) error: Fehler beim Versenden einiger Referenzen nach 'git@gitea.com:6543/go-sdk.git' ```

6543 commented

2019-12-30 20:14:31 +00:00

@zeripath merge conflict was after redo .. empty commit works - weared this is probably a gitea 🐛

@zeripath merge conflict was after redo .. empty commit works - **weared** this is probably a gitea :bug:

zeripath referenced this issue from a commit

2019-12-30 20:16:30 +00:00

prevent merge conflicts | gitattributes eol=lf (#200)

zeripath closed this pull request

2019-12-30 20:16:31 +00:00

6543 deleted branch gitattributes

2019-12-30 20:16:50 +00:00

6543 added this to the v0.11.0 milestone 2019-12-30 20:40:27 +00:00

Sign in to join this conversation.

No reviewers

No Milestone

No Assignees

3 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: gitea/go-sdk#200