Skip to content
This repository has been archived by the owner on Dec 18, 2017. It is now read-only.

Lock file entries should be sorted in a consistent manner to avoid conflicts #1221

Closed
davidfowl opened this issue Feb 16, 2015 · 2 comments
Closed

Lock file entries should be sorted in a consistent manner to avoid conflicts #1221

davidfowl opened this issue Feb 16, 2015 · 2 comments
Assignees
@BrennanConroy
Labels
3 - Done enhancement
Milestone
1.0.0-beta6

Comments

@davidfowl
Copy link
Member

To avoid potential merge conflicts, the lock file should have sorted:

  • Dependencies
  • File list
  • Framework assemblies
@davidfowl davidfowl added this to the 1.0.0-rc1 milestone Feb 16, 2015
@muratg muratg modified the milestones: 1.0.0-beta5, 1.0.0-beta4 Mar 20, 2015
@muratg muratg modified the milestones: 1.0.0-beta6, 1.0.0-beta5 May 22, 2015
@muratg
Copy link
Contributor

muratg commented Jun 25, 2015

@anurse Is the lock file format finalized? And is sorting as part of that?

@ChengTian ChengTian assigned BrennanConroy and unassigned ChengTian Jun 30, 2015
BrennanConroy added a commit that referenced this issue Jul 1, 2015
@BrennanConroy
#1221 Sorting lock file lists
526e522
@BrennanConroy BrennanConroy mentioned this issue Jul 1, 2015
Merged
BrennanConroy added a commit that referenced this issue Jul 1, 2015
@BrennanConroy
#1221 Sorting lock file lists
39a75d9
@BrennanConroy
Copy link
Member

39a75d9

@ChengTian ChengTian changed the title Lock entries should be sorted in a consistent manner to avoid conflicts Lock file entries should be sorted in a consistent manner to avoid conflicts Jul 23, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@BrennanConroy BrennanConroy

Labels
3 - Done enhancement
Projects
None yet
Milestone
1.0.0-beta6
Development

No branches or pull requests
4 participants
@davidfowl @ChengTian @muratg @BrennanConroy