LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
Conversation 3 Commits 120 Files Changed 57 +1151 -476
nutomic commented 2020-06-09 12:22:13 +00:00
Owner
Copy Link
No description provided.
dessalines commented 2020-06-09 18:06:35 +00:00
Owner
Copy Link

Damn this was beefy. Were there any rough merge conflicts?

Damn this was beefy. Were there any rough merge conflicts?
nutomic closed this pull request 2020-06-09 18:07:02 +00:00
nutomic commented 2020-06-09 21:37:38 +00:00
Author
Owner
Copy Link

The only real problem was with the cargo.lock (well annoyance really). Otherwise it was pretty straightforward.

The only real problem was with the cargo.lock (well annoyance really). Otherwise it was pretty straightforward.
nutomic commented 2020-06-10 00:51:14 +00:00
Author
Owner
Copy Link

Actually I was kind of hoping this would let us review where merge conflicts happened. I didn't pay perfect attention to the logic. This would all be much easier if we had federation merged into master, just disabled at build time.

Actually I was kind of hoping this would let us review where merge conflicts happened. I didn't pay perfect attention to the logic. This would all be much easier if we had federation merged into master, just disabled at build time.
👍 1
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 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: LemmyNet/lemmy#48
No description provided.
Delete Branch "merge-master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?